Comment clean up.