Remove automatic allocation of Dst map