Remove dependency to apache-2.2