Even more cleanup.
Removed unused functions.