removed TODO and FIXME declarations