D8 - code cleanup