Cleanup of unnecessary external interfaces