Remove unnecessary modules.
Minor twiddles to HashPSQ