Removed unnecissary code
merge