PIM-3070: Remove useless directories