Dashboard clean up