- Removed unneeded inheritance