remove most macros, use cls over tex preambles