Remove javax.naming dependency