Merge "Remove jack-related modules"