Hello template cleanup