Clean up movedef part1