rid of extra code