cleanup/review/etc; refactor mini SSDTs