Cleanup
Task [DWOSS--17]