cleaned up factories and models
Merge branch 'gem-upgrade' into develop
removed comment