removed old TODO and FIXME comments