refactor
refactor, remove unused methods