Removed hard-coded map folders

#3544 also some leftovers from #3777