Removed even more green code