d8 - code cleanup.