More Clean-up using Android Studio

Change for to for-each where possible.
Fill empty catch statements.
Remove unused imports
Clean up of methods and fields where they are not used.