got rid of extra code