First pass at scheduled delivery performance fix