fix delete mapping squash later