Simplfying code regarding graphs

Graphs were overcomplicating things, switching to a simpler declaration
within the dashboards which reference metrics directly.