Bin mysterious FIXME comment and 'if (0) return 0;' line

Change-Id: I41a29ec89b848ea0bfeb9975cd675357a2fcc69f