re #468 work on remove buff issue

@pilus i could use another set of eyes here, I THINK its having to do
with the time() part but i am not sure.