[Misc] Remove deprecation