Remove dupped factory
Weird state
Resolves users and minticleicon issues
Merge pull request #17 from bmneely/some-fixes

Some fixes