Navigation work, removing more debug