Cleanup
Cleanup in Navigation
Removes redundant threading calls
Removes more redundant threading calls