remove unused stuff
fix navigation bug!!!!!!