chore: Clean up redundant code and align model signatures#417

JusterZhu merged 2 commits into

masterGeneralLibrary/GeneralUpdate:masterfrom

issue/411-cleanupGeneralLibrary/GeneralUpdate:issue/411-cleanupCopy head branch name to clipboard