Removed TODO and FIXME markers