removed old FIXME comments