Remove more apache code and things that make external webservice calls.