Remove last traces of apache

Change-Id: I752de6769cbdaaa406580520a94d0dc2c5257154
my changes

Change-Id: I382c5b0dd3ddc652c1df815f0871dc8ba083aadd