Missed some bits of trilinos in the last commit, removed now