Remove before/after in favor of ext system