[fixup] scoped lock + remove conditions