Revert "singleton w Model, Map"

This reverts commit e11cc6f36cbe0b75dd4b1a02f5cb48004beefab2.