Removed an unused variable.
The map no longer holds an instance of the mapfactory.
Added the new mapfactory!
Revert "The map no longer holds an instance of the mapfactory."

This reverts commit e89ed30f4d67af9ed1e079cddc77b5bd6b39a6b8.
Revert "Added the new mapfactory!"

This reverts commit b0f68d049177f3d4be59b8b71690290c029a665d.