Remove unneeded spaces
Remove silly model expiration crap
Add function to detect JOINs in ModelBase