I think it would be OK to remove some of the comments regarding a better solution for singletons here.

We should also declare the associated methods [`@deprecated`](http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_tags.deprecated.pkg.html).