Run onBefore;  remove logging