Major template file changes
Remove some prints from files
General repo cleanups