Remove DB buffer for the time being...