Fix some URIs broken by API changes.
Remove obsolete code.