Revert "interface improvements"

This reverts commit 8433539337de16cbca68d5a16fffea54d66dbbfb.