Clean up move generation