Reduce overhead on completion