Partially cleanup inc_curr_1vb_split#375

JamesMcClung merged 16 commits into

psc-code:mainpsc-code/psc:mainfrom

JamesMcClung:pr/some-curr-cleanupJamesMcClung/psc:pr/some-curr-cleanupCopy head branch name to clipboard