Cleanup of templates HTML