Updated Opportunity Object to remove custom fields