When we have less values than we expect we don't fill anymore graphs
with 0 values. Also

- Removed some unused variables.