More cleanup. Mostly ClassTransforming stuff