Removing unused import causing builds to fail
Merge branch 'hotfix/unused-code'