Remove last traces of apache

Change-Id: I752de6769cbdaaa406580520a94d0dc2c5257154