Remove unnecessary navigations

#2