Remove navcontrol

Change-Id: I3333c0a383c422c0a787fd2fa0f81657c3bf1229