Removed unnecessary custom fields