comment out dead code
add some explanations
fix mp in prd