Refactoring of and/not; autogen cleanup

Removed one more autogen file. Refactored .mtl to use standalone 'and'
and 'not's