DataKeeper: added clearing DataKeeper on clearing buffer