More parametrized DashboardHelper
More robust cleaning (still not perfect)