Remove dependency on Apache 2 (for now)