Eliminated map_models_hash stuff, not tested, not needed