Merge "Remove obsolete code."