More navigator cleanup