Cleanup move.d imports