fixed a lot of removal-related crap