cleanup - remove field if already defined