Lots of cleanup in pru.c