Remove some ifdef 0'd code and fix an XXX.

--HG--
branch : HEAD
1 file changed