And remove corresponding TODO