fixed navigator exception
removed unused service
Merge remote-tracking branch 'github/master'