Smaller fixes and removed old dependencies.

On branch: chatrooms