a few more removed critical sections