rare deadlock case eliminated, custom map removed
""