Improved CircleCI config
Removed unused imports