Remove some error-prone puppets and brews