war: final cleanup