Initial template cleanup