Sometimes, when you remove something, you should actually remove it...