Trying to clean up database connections