Remove dependency on traits