Clean up and more keys.