misc fixes and two new removal strategies