Different way of cleaning map.
Fixes #455
Fixed #454
Fixed #452
Merge branch 'master' into refactor

Conflicts:
	gamemode/init.lua