SWC-736 Supertable cleanup work