diff --git a/profiler.sh b/profiler.sh
deleted file mode 100755
index 290b45ebc..000000000
--- a/profiler.sh
+++ /dev/null
@@ -1,392 +0,0 @@
-#!/bin/sh
-set -eu
-
-usage() {
-    echo "Usage: $0 [action] [options] <pid>"
-    echo "Actions:"
-    echo "  start             start profiling and return immediately"
-    echo "  resume            resume profiling without resetting collected data"
-    echo "  stop              stop profiling"
-    echo "  dump              dump collected data without stopping profiling session"
-    echo "  check             check if the specified profiling event is available"
-    echo "  status            print profiling status"
-    echo "  meminfo           print profiler memory stats"
-    echo "  list              list profiling events supported by the target JVM"
-    echo "  collect           collect profile for the specified period of time"
-    echo "                    and then stop (default action)"
-    echo "Options:"
-    echo "  -e event          profiling event: cpu|alloc|lock|cache-misses etc."
-    echo "  -d duration       run profiling for <duration> seconds"
-    echo "  -f filename       dump output to <filename>"
-    echo "  -i interval       sampling interval in nanoseconds"
-    echo "  -j jstackdepth    maximum Java stack depth"
-    echo "  -t                profile different threads separately"
-    echo "  -s                simple class names instead of FQN"
-    echo "  -g                print method signatures"
-    echo "  -a                annotate Java methods"
-    echo "  -l                prepend library names"
-    echo "  -o fmt            output format: flat|traces|collapsed|flamegraph|tree|jfr"
-    echo "  -I include        output only stack traces containing the specified pattern"
-    echo "  -X exclude        exclude stack traces with the specified pattern"
-    echo "  -v, --version     display version string"
-    echo ""
-    echo "  --title string    FlameGraph title"
-    echo "  --minwidth pct    skip frames smaller than pct%"
-    echo "  --reverse         generate stack-reversed FlameGraph / Call tree"
-    echo ""
-    echo "  --loop time       run profiler in a loop"
-    echo "  --ttl time        automatically shutdown profiler at <time>(absolute or relative) when it's in loop (continuous profiling) model"
-    echo "  --alloc bytes     allocation profiling interval in bytes"
-    echo "  --live            build allocation profile from live objects only"
-    echo "  --lock duration   lock profiling threshold in nanoseconds"
-    echo "  --total           accumulate the total value (time, bytes, etc.)"
-    echo "  --all-user        only include user-mode events"
-    echo "  --sched           group threads by scheduling policy"
-    echo "  --cstack mode     how to traverse C stack: fp|dwarf|lbr|no"
-    echo "  --begin function  begin profiling when function is executed"
-    echo "  --end function    end profiling when function is executed"
-    echo "  --ttsp            time-to-safepoint profiling"
-    echo "  --jfrsync config  synchronize profiler with JFR recording"
-    echo "  --lib path        full path to libasyncProfiler.so in the container"
-    echo "  --fdtransfer      use fdtransfer to serve perf requests"
-    echo "                    from the non-privileged target"
-    echo ""
-    echo "<pid> is a numeric process ID of the target JVM"
-    echo "      or 'jps' keyword to find running JVM automatically"
-    echo "      or the application's name as it would appear in the jps tool"
-    echo ""
-    echo "Example: $0 -d 30 -f profile.html 3456"
-    echo "         $0 start -i 999000 jps"
-    echo "         $0 stop -o flat jps"
-    echo "         $0 -d 5 -e alloc MyAppName"
-    exit 1
-}
-
-mirror_output() {
-    # Mirror output from temporary file to local terminal
-    if [ "$USE_TMP" = true ]; then
-        if [ -f "$FILE" ]; then
-            cat "$FILE"
-            rm "$FILE"
-        elif [ -f "$ROOT_PREFIX$FILE" ]; then
-            cat "$ROOT_PREFIX$FILE"
-            rm "$ROOT_PREFIX$FILE"
-        fi
-    fi
-}
-
-mirror_log() {
-    # Try to access the log file both directly and through /proc/[pid]/root,
-    # in case the target namespace differs
-    if [ -f "$LOG" ]; then
-        cat "$LOG" >&2
-        rm "$LOG"
-    elif [ -f "$ROOT_PREFIX$LOG" ]; then
-        cat "$ROOT_PREFIX$LOG" >&2
-        rm "$ROOT_PREFIX$LOG"
-    fi
-}
-
-check_if_terminated() {
-    if ! kill -0 "$PID" 2> /dev/null; then
-        mirror_output
-        exit 0
-    fi
-}
-
-fdtransfer() {
-    if [ "$USE_FDTRANSFER" = "true" ]; then
-        FDTRANSFER_PATH="@async-profiler-$(od -An -N3 -i /dev/random | xargs)"
-        PARAMS="$PARAMS,fdtransfer=$FDTRANSFER_PATH"
-        if [ -n "$ACCEPT_TIMEOUT" ]; then
-          "$FDTRANSFER" "$FDTRANSFER_PATH" "$PID" "$ACCEPT_TIMEOUT"
-        else
-          "$FDTRANSFER" "$FDTRANSFER_PATH" "$PID"
-        fi 
-    fi
-}
-
-jattach() {
-    set +e
-    "$JATTACH" "$PID" load "$PROFILER" true "$1,log=$LOG" > /dev/null
-    RET=$?
-
-    # Check if jattach failed
-    if [ $RET -ne 0 ]; then
-        if [ $RET -eq 255 ]; then
-            echo "Failed to inject profiler into $PID"
-            if [ "$UNAME_S" = "Darwin" ]; then
-                otool -L "$PROFILER"
-            else
-                LD_PRELOAD="$PROFILER" /bin/true
-            fi
-        fi
-
-        mirror_log
-        exit $RET
-    fi
-
-    mirror_log
-    mirror_output
-    set -e
-}
-
-SCRIPT_BIN="$0"
-while [ -h "$SCRIPT_BIN" ]; do
-    SCRIPT_BIN="$(readlink "$SCRIPT_BIN")"
-done
-SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_BIN")" > /dev/null 2>&1; pwd -P)"
-
-JATTACH=$SCRIPT_DIR/build/jattach
-FDTRANSFER=$SCRIPT_DIR/build/fdtransfer
-USE_FDTRANSFER="false"
-FDTRANSFER_PATH=""
-PROFILER=$SCRIPT_DIR/build/libasyncProfiler.so
-ACTION="collect"
-DURATION="60"
-ACCEPT_TIMEOUT=""
-FILE=""
-USE_TMP="true"
-OUTPUT=""
-FORMAT=""
-PARAMS=""
-PID=""
-
-while [ $# -gt 0 ]; do
-    case $1 in
-        -h|"-?")
-            usage
-            ;;
-        start|resume|stop|dump|check|status|meminfo|list|collect)
-            ACTION="$1"
-            ;;
-        -v|--version)
-            ACTION="version"
-            ;;
-        -e)
-            PARAMS="$PARAMS,event=$2"
-            shift
-            ;;
-        -d)
-            DURATION="$2"
-            shift
-            ;;
-        -f)
-            FILE="$2"
-            USE_TMP=false
-            shift
-            ;;
-        -i)
-            PARAMS="$PARAMS,interval=$2"
-            shift
-            ;;
-        -j)
-            PARAMS="$PARAMS,jstackdepth=$2"
-            shift
-            ;;
-        -t)
-            PARAMS="$PARAMS,threads"
-            ;;
-        -s)
-            FORMAT="$FORMAT,simple"
-            ;;
-        -g)
-            FORMAT="$FORMAT,sig"
-            ;;
-        -a)
-            FORMAT="$FORMAT,ann"
-            ;;
-        -l)
-            FORMAT="$FORMAT,lib"
-            ;;
-        -o)
-            OUTPUT="$2"
-            shift
-            ;;
-        -I|--include)
-            FORMAT="$FORMAT,include=$2"
-            shift
-            ;;
-        -X|--exclude)
-            FORMAT="$FORMAT,exclude=$2"
-            shift
-            ;;
-        --filter)
-            FILTER="$(echo "$2" | sed 's/,/;/g')"
-            FORMAT="$FORMAT,filter=$FILTER"
-            shift
-            ;;
-        --title)
-            # escape XML special characters and comma
-            TITLE="$(echo "$2" | sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g; s/,/\&#44;/g')"
-            FORMAT="$FORMAT,title=$TITLE"
-            shift
-            ;;
-        --width|--height|--minwidth)
-            FORMAT="$FORMAT,${1#--}=$2"
-            shift
-            ;;
-        --reverse)
-            FORMAT="$FORMAT,reverse"
-            ;;
-        --samples|--total)
-            FORMAT="$FORMAT,${1#--}"
-            ;;
-        --alloc|--lock|--chunksize|--chunktime)
-            PARAMS="$PARAMS,${1#--}=$2"
-            shift
-            ;;
-        --timeout|--loop)
-            if [ "$ACTION" = "collect" ]; then
-                ACTION="start"
-            fi
-            ACCEPT_TIMEOUT="$2"
-            PARAMS="$PARAMS,${1#--}=$2"
-            shift
-            ;;
-        --ttl)
-            PARAMS="$PARAMS,${1#--}=$2"
-            shift
-            ;;
-        --all-user)
-            PARAMS="$PARAMS,alluser"
-            ;;
-        --sched)
-            PARAMS="$PARAMS,sched"
-            ;;
-        --live)
-            PARAMS="$PARAMS,live"
-            ;;
-        --cstack|--call-graph)
-            PARAMS="$PARAMS,cstack=$2"
-            shift
-            ;;
-        --begin|--end)
-            PARAMS="$PARAMS,${1#--}=$2"
-            shift
-            ;;
-        --ttsp)
-            PARAMS="$PARAMS,begin=SafepointSynchronize::begin,end=RuntimeService::record_safepoint_synchronized"
-            ;;
-        --jfrsync)
-            OUTPUT="jfr"
-            PARAMS="$PARAMS,jfrsync=$2"
-            shift
-            ;;
-        --lib)
-            PROFILER="$2"
-            shift
-            ;;
-        --fdtransfer)
-            USE_FDTRANSFER="true"
-            ;;
-        --safe-mode)
-            PARAMS="$PARAMS,safemode=$2"
-            shift
-            ;;
-        [0-9]*)
-            PID="$1"
-            ;;
-        jps)
-            # A shortcut for getting PID of a running Java application
-            # -XX:+PerfDisableSharedMem prevents jps from appearing in its own list
-            PID=$(pgrep -n java || jps -q -J-XX:+PerfDisableSharedMem)
-            if [ "$PID" = "" ]; then
-                echo "No Java process could be found!"
-            fi
-            ;;
-        -*)
-            echo "Unrecognized option: $1"
-            usage
-            ;;
-        *)
-            if [ $# -eq 1 ]; then
-                # the last argument is the application name as it would appear in the jps tool
-                PID=$(jps -J-XX:+PerfDisableSharedMem | grep " $1$" | head -n 1 | cut -d ' ' -f 1)
-                if [ "$PID" = "" ]; then
-                    echo "No Java process '$1' could be found!"
-                fi
-            else
-                echo "Unrecognized option: $1"
-                usage
-            fi
-            ;;
-    esac
-    shift
-done
-
-if [ "$PID" = "" ]; then
-    case "$ACTION" in
-        version)
-            java "-agentpath:$PROFILER=version=full" -version 2> /dev/null
-            ;;
-        list)
-            java "-agentpath:$PROFILER=list" -version 2> /dev/null
-            ;;
-        *)
-            usage
-            ;;
-    esac
-    exit 0
-fi
-
-# If no -f argument is given, use temporary file to transfer output to caller terminal.
-# Let the target process create the file in case this script is run by superuser.
-if [ "$USE_TMP" = true ]; then
-    FILE=/tmp/async-profiler.$$.$PID
-else
-    case "$FILE" in
-        /*)
-            # Path is absolute
-            ;;
-        *)
-            # Output file is written by the target process. Make the path absolute to avoid confusion.
-            FILE=$PWD/$FILE
-            ;;
-    esac
-fi
-LOG=/tmp/async-profiler-log.$$.$PID
-
-UNAME_S=$(uname -s)
-if [ "$UNAME_S" = "Linux" ]; then
-    ROOT_PREFIX="/proc/$PID/root"
-else
-    ROOT_PREFIX=""
-fi
-
-case $ACTION in
-    start|resume)
-        fdtransfer
-        jattach "$ACTION,file=$FILE,$OUTPUT$FORMAT$PARAMS"
-        ;;
-    check)
-        jattach "$ACTION,file=$FILE,$OUTPUT$FORMAT$PARAMS"
-        ;;
-    stop|dump)
-        jattach "$ACTION,file=$FILE,$OUTPUT$FORMAT"
-        ;;
-    status|meminfo|list)
-        jattach "$ACTION,file=$FILE"
-        ;;
-    version)
-        jattach "version=full,file=$FILE"
-        ;;
-    collect)
-        fdtransfer
-        jattach "start,file=$FILE,$OUTPUT$FORMAT$PARAMS"
-        echo Profiling for "$DURATION" seconds >&2
-        set +e
-        trap 'DURATION=0' INT
-
-        while [ "$DURATION" -gt 0 ]; do
-            DURATION=$(( DURATION-1 ))
-            check_if_terminated
-            sleep 1
-        done
-
-        set -e
-        trap - INT
-        echo Done >&2
-        jattach "stop,file=$FILE,$OUTPUT$FORMAT"
-        ;;
-esac
diff --git a/src/fdtransfer.h b/src/fdtransfer.h
index 833dd6ed4..1e9d08da3 100644
--- a/src/fdtransfer.h
+++ b/src/fdtransfer.h
@@ -13,8 +13,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#define DEFAULT_ACCEPT_TIMEOUT 30
-
 #define ARRAY_SIZE(arr)  (sizeof(arr) / sizeof(arr[0]))
 
 #define RESTARTABLE(call)  ({ ssize_t ret; while ((ret = call) < 0 && errno == EINTR); ret; })
diff --git a/src/launcher/fdtransferServer_linux.cpp b/src/launcher/fdtransferServer_linux.cpp
index f4da1c1fd..f12a71418 100644
--- a/src/launcher/fdtransferServer_linux.cpp
+++ b/src/launcher/fdtransferServer_linux.cpp
@@ -282,49 +282,21 @@ bool FdTransferServer::runOnce(int pid, const char *path) {
         }
     }
 
-
-    int accept_timeout_seconds = DEFAULT_ACCEPT_TIMEOUT;
-    if (_accept_timeout) {
-        int timeout = Arguments::parseTimeout(_accept_timeout);
-        if (timeout > 0) {
-            accept_timeout_seconds = timeout + DEFAULT_ACCEPT_TIMEOUT;
-        }
-    }
-    fprintf(stderr, "[INFO] set accept timeout to %d seconds\n", accept_timeout_seconds);
-
-    if (!bindServer(&sun, addrlen, accept_timeout_seconds)) {
+    if (!bindServer(&sun, addrlen, 30)) {
         return false;
     }
 
-    if (0 != fork()) {
-        // Exit now, let our caller continue.
-        return 0;
-    }
-
     if (!enter_ns(pid, "pid") == -1) {
         fprintf(stderr, "Failed to enter the PID NS of target process %d\n", pid);
         return false;
     }
 
-    // Infinitely wait for subsequent connection until timeout, this is necessary when use "--loop" option.
-    while (1) {
-        if (!acceptPeer(&nspid)) {
-            return 1;
-        }
-        // CLONE_NEWPID affects children only - so we fork here.
-        int child = fork();
-        if (-1 == child) {
-            perror("unable to fork");
-            return 1;
-        } else if (0 == child) {
-            return serveRequests(nspid);
-        } else {
-            // Exit now, let our caller continue.
-            // return 0;
-            FdTransferServer::closePeer();
-            // Wait subprocess to exit.
-            RESTARTABLE(waitpid(child, NULL, 0));
-        }
+    // CLONE_NEWPID affects children only - so we fork here.
+    if (fork() == 0) {
+        return acceptPeer(&nspid) && serveRequests(nspid);
+    } else {
+        // Exit now, let our caller continue.
+        return true;
     }
 }
 
@@ -377,26 +349,4 @@ bool FdTransferServer::runLoop(const char *path) {
     }
 }
 
-// int main(int argc, const char** argv) {
-//     int pid = 0;
-//     if (argc >= 3) {
-//         if (argc > 3) {
-//             _accept_timeout = (char *)argv[3];
-//         }
-//         pid = atoi(argv[2]);
-//     } else if (argc != 2) {
-//         fprintf(stderr, "Usage: %s <path> [<pid>]\n", argv[0]);
-//         return 1;
-//     }
-
-//     // 2 modes:
-//     // pid is not given - bind on a path and accept requests forever, from any PID, until being killed.
-//     // pid is given     - bind on an path for that PID, accept requests only from that PID until the single connection is closed.
-//     if (pid != 0) {
-//         return single_pid_server(pid, argv[1]);
-//     } else {
-//         return path_server(argv[1]);
-//     }
-// }
-
 #endif // __linux__
diff --git a/src/launcher/main.cpp b/src/launcher/main.cpp
index d336842b6..b424bc28d 100644
--- a/src/launcher/main.cpp
+++ b/src/launcher/main.cpp
@@ -65,6 +65,7 @@ static const char USAGE_STRING[] =
     "  --reverse         generate stack-reversed FlameGraph / Call tree\n"
     "\n"
     "  --loop time       run profiler in a loop\n"
+    "  --ttl duration    total duration the profiler keeps running, which is useful in the loop (continuous profiling) model\n"
     "  --alloc bytes     allocation profiling interval in bytes\n"
     "  --live            build allocation profile from live objects only\n"
     "  --lock duration   lock profiling threshold in nanoseconds\n"
@@ -477,6 +478,9 @@ int main(int argc, const char** argv) {
             params << "," << (arg.str() + 2) << "=" << args.next();
             if (action == "collect") action = "start";
 
+        } else if (arg == "--ttl") {
+            params << ",ttl=" << args.next();
+
         } else if (arg == "--fdtransfer") {
             char buf[64];
             snprintf(buf, sizeof(buf), "@asprof-%d-%08x", getpid(), (unsigned int)time_micros());