Remove PSearch
Resolve conflict for Clang and XPTemplate

To fix i_C_K conflict between Clang and XPTemplate