Remove use of Move