removed templates in files, keep it light