More portfolio template cleanup