PYC tidy up.