p8p and clean up