Fix ordering on remove

I have tested this against a local vm.