clear up backlog TOOD/FIXME