Merge "Remove obsolete dist rules"