Cleaning up

removed unnecessary code