- Removed uneeded inheritance