Fixed duplication

There was some data duplication in the models (two foreign keys to Survey when one was more efficient/appropriate), fixed.