Remove the dependency on CollectionUtils (commons-collection from Apache)