use FEMs for puppet stuff
remove some commented lines