Remove duplicate apps and cleanup (2/2)

Change-Id: Ie76b46ebd0bf365a96be6d6a314830341119b157