! Continue to fix the memory leak.
* Refactor.
* Refactor.
* Refactor.
* Remove obsolete code.

Should have been removed by a previous refactoring.
* Refactor.