Cleaning up, and making some deletion behavior work again.