More cleanup for keys