Internal interface cleanup

Created by  tesaguri  on January 22, 2021
W7MBX5FRTR4FLE7AQPIFQCS5VMTFMTIFMRY3XP33QUUK3GCE72HQC
Change contents