Merge "Remove some obsolete code." into gingerbread