Remove unused widget imports + some comments

TBR