Sort out Pluggable interface and delete the middlemen