FileIO clean up