Refactor: Remove redundant code