Finish last todos relevant for this branch