#810 removed unused code