added auto-teardown for duplicate entity tracker