Sample key removal
More cleanup