Merge "Remove unnecessary code." into honeycomb