MoveBase cleanup