Cleanup merge derpies from new status bar mods

Change-Id: If82e77c4d84fb23df24204f03f2c3c488ecceec2