remove unused function
remove comment
some test refactor