remove unused package
refactor and add method