- Removed traits to remove dependencies