Remove Apollo

Change-Id: If9772a8c65d4da2e6c41b140b55c069efa9893a1