Remove config singleton. Still has failing legacy tests