P4 cleanups

@bdbaddog: Can you test these out?