Set dimension based on environment instead of world name (#2305)* Set dimension based on environment instead of world name* Minor classpath cleanup (commit: 73b8623)