Cleanup last commit

Finish commenting out things that didn't work.