clean up fs handling