Cleaning up models, specifically relationships