improved NA removal