Removed comments from templates