#65 clear up erb temlates