Refactor: Eliminate dead code