D8 1.x - repo cleanup