Cleanup of page template files
Merge