Remove obsoleted fields some which will be replaced
Simplify the Contact models to remove duplication