removed new_bootstrap_contact functor and cleanup