Clean up for coding standards

Removed commented generated methods