#1014 - revert changes and clean up templates