Added singleton and removed an unused function

That's it