More commenting out to fix broken compiling