admin cleanup and normalization