[sd2_mr0644] Cleanup