Remove combined WAR for now