Remove use of YangInstanceIdentifier.EMPTY