Reduce static references to collections, databases, etc