not use file remove and bug fix