Merge "Remove old code that isn't relevant anymore."