Remove duplicate apps and cleanup (1/2)

Change-Id: Ia07850d42bd969e3d3c0cfb18d737bacb8e99ba8