remove extra revert steps. trap reverts fine