Remove @todo's