removed commented out and auto generated code