Cleaup logging after upgrade: use non-deprecated annotations, remove un-...

...used logging methods, re-format