Cleaned up templating code
Removed files not needing revision control