clean up convenience key values
2.0.0