Deleting all commented out code to clean it up a bit