SWC-804 Cleanup code