move WARAppCleanUp out to util