Cleanup models code to extend base object

Test Plan:
- Verified everything is still working.