cleanup unused functions and comment.