Merge "Remove debug code" into honeycomb