Remove some useless static HashMaps