Commented out some more blocks.  Hopeful lagfix.