BUG: Removed unused hooks