Done with removal support (I think)

Hopefully...