removing extra code