Remove licenses. Add Singleton