Naru - Remove use of Unit in TPL.