Removed unused imports
Merge branch 'master' into peter