remove strange dictionary use workarounds