removed some unnecissary code