- Classes now inherit elements from grandparent (etc.) as well as parent classes
- Removed dead code