Cleanup + Fix for dead puppets