MswRollUp: Started to clean up the MSW code.
This is an intermediate commit and does not compile
p4#: 22216