Remove last use of fs-data and f-data from modules