key name cleanup