Cleanup

- Returned new root user model to initial version because it is not
used anymore
Merge pull request #65 from pajcho/development

Cleanup