remove bad smell
remove useless function