[Refactor] Remove superfluous deconstruction