refactor some obsolete method