Code cleanup.  Lots of useless stuff was happening.