Remove some calls to commons-collections