Clean up commented out code
Clean up