Police and crime commissioners to be scrapped