Hi Maria,
I have just spoken to Tracy Walsh this morning and she has already advised Treasury so they are aware the data files will not have any 585s, as under legislation we need to apply for them.
So in answering your question you submit your data as is with 2016 values.
