Map loading is slightly better
Removed config option that are no longer in use