removing vestigial forecast and gr_block include