removing more old-style hooks