Issue #564 code review fixes

- removed commented out code
- reordered imports (used Android Studio auto-organize imports, so if
the formatting is ok, I can run auto-organize on the whole project as a
later commit)