Remove white-space
Remove overthrow from template source files