Remove dead code which wasn't even compiling, due to #defines (leftovers from debugging).