remove old double buffer solution