reconsidered which functions should be exported
removed unnecessary direct dependencies