Refactor: Delete dead code