Fix various issues including switch to use 'modern--1.2' collection apis remove unused assignments fix javadoc fix bloated assignment scope remove duplication make sure files are closed npe guards remove unnecessary fields
Created attachment 24719 [details] miscellaneous fixes