Merge "Removing legacy distribution."