Cleanup
Removed a lot of unwanted locking