Refactor: Remove duplicated step