Refactoring to remove unnecessary intermediate interface.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
Remove unused methods and reduce visibility of internals.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>