Cleaning up commented out code