Strip the delayed buffer code. New systems in place make this obsolete.