Removed all 'gon' references from project