#41 Removing remaining usage of userDao