Removed reverences to Apache as well