Remove some old code and add FIXME comments