remove old generator-based api