remove generator/Generator, and a deprecation warning