LP#1386347 Remove more unneeded map deleters