Remove some unused methods and make classes that wrap a collection to not expose it directly. Provide only operations to manage it.