Clean up old hashes and standardize remaining one