- Removed unused code, CS, Cosmetics
- Removed unneeded inheritance
- Cosmetics