Clean up imports
Merge branch 'master' of https://github.com/henryyang42/Canvas