Merge "Remove obsolete directories"