Remove geerlingguy.apache dependency