Removed all comments from templated files to make them readable