remove unnecessary navigation code
navigation code: issue #137, issue #145