Remove a couple of unnecessary critical sections