Refactor, remove unused methods