Update comment & remove useless code