Replace usage of some deprecated functions

* Has some related refactoring because Skin no longer has to be passes around.
* Removed unused globals, local variables and commented out code.
* Some documentation tweaks.

Change-Id: Ie1453e37454d4fa995834db2ec101676444f092d