remove useless code and fix string case issue.....