Catch up with some more nice cleanup of the frequency lists