General cleanup, plus initial pgrep