removed singleton