more work on removing masqueraded user/room/host names