Revert "Put back in the templates"

This reverts commit ab90590feefee914ed608b2c75785873c497e3f8.
Removed unneeded lib and function variables