issue_157: clean up dependencies
Merge branch 'issue_157' into financial