some cleanup in navigation