puk2 migration
Minor cleanup and puke2 migration
Testing type