PBL-6392: Removed more SDK1 cruft