Merge "Docs plus removing some junk per API review." into honeycomb