Removing generator from main