Update to work with 20130709 API. Remove dead code.