Cleanup of Code
Merge remote-tracking branch 'origin/dev-simplecontactsdemoapp/bhe' into dev-simplecontactsdemoapp/cgu
Merge remote-tracking branch 'origin/dev-simplecontactsdemoapp/cgu' into dev-simplecontactsdemoapp/bhe