MD cleanup