Removed the remaining ad-hoc created model objects.
Cleaned up, simplified and refactored things around that.