remove active-buffer stuff