Removed the Collaborators model

We are going to implement this with another app
Updated TeamFactory
Fixed a couple variable name issues (#1727, #1728)