some cleanups for building without collab.