Remove move handling