Cleanup

- Returned new root user model to initial version because it is not
used anymore