remove bogus template parameter
don't import internal sun classes
don't use commons-lang and commons-lang3 at the same time->3