Stronger Than Dirt

I am doing some code cleanup following the big merge.

I am nearly done.

Unfortunately, nearly done means not finished, so I guess I'll plug away on this some more later. :)