Removed JEE 7 stuff to test with JEE 6 instead