[OE-3908] Fixed remove all behaviour
Removed obsolete (commented out) code