Quick fix.

Bunch of stuff commented until it can be repaired.