Clean up forecast function. Now both in historical and future data there
can be more variables than necessary.