Removed some more useless locks, all this runs on a single thread.