Clean up commented code