(PDB-660) More cleanups, doc removals etc.