Removed some more custom fields code