Remove dependency on osgi.j2ee