Remove extra code