Hopefully fixed all the remove bugs.