taking out extra code