Clean up movedef part2