main: Cleanup

Change-Id: Id6845f7b22976ebb558370c1863669d16a6ed82f