[refactor] minor breaking simplifications