Improve documentation and clean up superfluous interfaces