Drops additional variables from the follow-up dataset. Closes #1047 and closes #1048