removing several uses of Stringmap