Removing Zone7 Parser and Old Groovy Lancaster junk
Defaulted manufacturer to blank instead of null