removed last of doctrine cruft