Remove before/after handlers