[OE-3763] Removed deprecated files and replaced deprecation warnings with @todos