Apollo: code cleanup

Change-Id: Ib3bc08959122cac545c06798e47c4a495a6d2692