use new util method to replace source
remove useless methods