Remove dependency on collections