[Meta] Code clean up on D8 branch