Removed spurious imports
Merge branch 'master' of github.com:minghan/snapworld