remove joins from models

this needs rewritten before model joins are going to work easily