Cleanup legacy hooks