Update to JavaEE 7
Clean up.