Clean up DB connect calls