commented out old, unused code that is causing issues.  remove completely?