Cleanup dashboard on refresh

Fixing issue #310