non-func cleanups
email PNSWSH to me as well, because I care!