Removing the classes requires updating tests and so is planned to be done with a separate change.
CodeGenTypes
CodeGen