Improved random map generator; removed obsolete variables