removed way/generators