cleanups for maintenance, always handle buffers before sources