Small cleanup of comments and delete_contact