Fixing Singleton DI, and cleanup on context