refactor: removed redundant code