unnessasary code removal