Remove org.apache dependency