removed singleton (Constants)