Tidy up more hooks