simplify contact deletion, ensure contacts_for keys are deleted
simplify contact deletion, ensure contacts_for keys are deleted

necula01/flapjack,necula01/flapjack,necula01/flapjack,ikusalic/flapjack,necula01/flapjack,flapjack/flapjack,ikusalic/flapjack,cloudevelops/flapjack,cloudevelops/flapjack,ikusalic/flapjack,cloudevelops/flapjack,necula01/flapjack,flapjack/flapjack,flapjack/flapjack,flapjack/flapjack,ikusalic/flapjack,cloudevelops/flapjack,flapjack/flapjack,ikusalic/flapjack