Cleaning up

removing old commented code