Cleanup + Fix for dead puppets
Merge pull request #711 from SnickySnacks/4.1-dev

Cleanup + Fix for dead puppets