Removing commented out code