Added remove and do_remove methods