cleaned up some stuff in CollectionUtil