Removes calls to belongs_to