Many fixes : o potential NPE o unused imports removal o useless @SuppressWarnings removal o unused variable removal