commented some unnessary code