Kill some more useless complexity. This was put in when I thought I was building a different direction. I found a better way. Now that it works, I can delete the cruft.