Get rid of unnecessary singleton pattern