- changed logic for folder removing