Cleaning up item movement (WIP)