Yep, this is necessary :) you can remove the TODO.