Refactor delete mapped collection