Remove unused import
Minor code fixes to pass gradlew check