fixed removals so they actually work