remove some unnessecary code