Remove use of tmp war (cont.)