Getting rid of the bi-directional associations in the model