Convert all modules to new hook method, clean up a bit