get rid of extra code