Minor changes.
remove useless part.