Finalized interface changes.

Now unused interface related code has been removed.