continued work on cleaning up wcsaling