Disabled this until unclosed db connection is fixed