More deleting, docco updates