branch + functional clean up

Fixed mistake with room broadcast so now all clients get the broadcast
instead of those other than the current.

Cleaned up some remnants and unneeded files for this branch.