WIP cleanup pig module