Cleaned up delegates and greened the file
More delegate cleanup