Remove all of the conditional checking of before/after