Fix some API details.
Remove incorrect dependency.