Cleanup and bugfix

Jira issue: HUBWH-6
Handling remote db for midwife.

Jira issue: HUBWH-6
Small fix.

Jira issue: HUBWH-6