Merge "Remove a directory that seems never to have been used."