RC: Cleanup: remove navbar category

Change-Id: Idb1eea3b585a0551dfdba6666eaa47cf541e5c52