Remove annoying deprecation