Fix keys clean up