Use latest android version
Prevent possible NPE

IntelliJ warns about this, not sure if that actually ever happened
Remove unused method