* template cleanup