Use moveLastOver instead of Remove

This is important especially in the light or recent changes in core.
It will also increase performance and fix potential problems with deletes and links.