Cleanup some of Riking's mess.
Cleanup more of Riking's mess.