removed more apache references