* Remove obsolete code.
* Refactor.