added more DB connection cleanup