Cleans up vcore/uth/pth init code