Puppet removed for now, too much headache