Merge "Code cleanup from rebase" into sc-v2-dev