remove useless code
renaming