removed delivery errors flag
removed some actions