Remove left overs of navbar switch

Change-Id: I1e8eed6f5b3b3298a4a32084a8796477317bbfed