removed some belongsTo/hasOne.
Merge remote-tracking branch 'origin/master'