clean up of file system pt. 1 (more to come)