Collab code: remove more dead code and fix compiler warnings when building without collab