refactor; remove needless methods