removing the extra code