squash npe
fix two bugs in Clean Imports