special handling for contact is_deleted field, comments, code clean up