Clean up unnecessary comments and code in controllers