house cleaning of class defs