[OE-4139] Removed commented code not used anymore