Remove commons-collections dependency (500kb for one method...).
Some cleanup...