Removed more defunct Threading mutexes
Fixed control reaching the end of a non-void function
Merge branch 'cleanup'