[mt375] Some cleanup
[mt376] Preparation