PIM-3070: Clean directories