clean up nounpack handling