Remove unnecessary reentrancy