Refactor/remove unused methods