Removed all use of service references stored in static fields