removed old maps loading logic
cleanup
merge changes from master