Then it might be some sort of a bug in 2.x. Deleting directories manually sounds like a reasonable solution, but since I don't fully understand the mechanism that leads to this issue in the first place, I cannot really guarantee that your solution would not cause any issues. I think the right solution would be to upgrade to 5.x, where this problem was solved properly.