Cleanup of the add contact code.