Cleanup
Task [DWOSS-1]