Cleanup
Working on PKINIT