Remove TomCat 6 and second Java SE 7 library