Cleaned up DashClient