Clean up commented out sections