Removed templating
Removed extraneous libraries