[OE-3763] Replaced deprecation warnings with @todos