Fix  'not reg. as collab.' and 'undefined qt'
Remove some unused code.
Merge remote-tracking branch 'upstream/master'