Remove unused code
Break dashboard data query into 3 different ones