Remove puppet stuff take two