removed some unnessary code