Apollo: cleanup

Change-Id: I2d342da95a9c086793edab10bbee574a4910228c