SWC-773 Clean up code