Cleaned up code after permanently switching to pooled connection