Clean up move method