Fixed loads of errors with removing things.