cleaned up the code and removed custom field types