Added fs-cleaner... not finished yet