Removed old generator block variables