Cleaning up some obsolete previous efforts