-aremoved unnecessary codes