cleaning up some unnessecary code