remove debug code
Merge branch 'master' into remove-contact