added base remove_update code