Remove h_w
Merge branch 'leo-Melnik'