cleaned up some things I had commented out