Remove old style generator class