Fix incorrect phi terminating ChkCase
Cleanup