Swc-1663:  preliminary cleanup