[WH-43] Full refactoring - delete content