Merge "Removing old code."