Remove before/after operation nonsense