more changes on folder delete issue