Removing generator functions