Revert "More cleanup.  Been bugging me for a while"

This reverts commit d12deeab40b8b6793b6568b78594e5857e4729f0