remove unused method
refactor for more composition