Removed unused imports
Merge branch 'develop'