Index: uspace/app/bnchmark/bnchmark.c
===================================================================
--- uspace/app/bnchmark/bnchmark.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/bnchmark/bnchmark.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -62,23 +62,14 @@
 {
 	struct timeval start_time;
-	int rc;
-	rc = gettimeofday(&start_time, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "gettimeofday failed\n");
-		return rc;
-	}
-	
-	rc = fn(data);
+	gettimeofday(&start_time, NULL);
+	
+	int rc = fn(data);
 	if (rc != EOK) {
 		fprintf(stderr, "measured function failed\n");
 		return rc;
 	}
-
+	
 	struct timeval final_time;
-	rc = gettimeofday(&final_time, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "gettimeofday failed\n");
-		return rc;
-	}
+	gettimeofday(&final_time, NULL);
 	
 	/* Calculate time difference in milliseconds */
@@ -92,8 +83,7 @@
 	char *path = (char *) data;
 	char *buf = malloc(BUFSIZE);
-
-	if (buf == NULL) {
+	
+	if (buf == NULL)
 		return ENOMEM;
-	}
 	
 	FILE *file = fopen(path, "r");
Index: uspace/app/nettest1/nettest1.c
===================================================================
--- uspace/app/nettest1/nettest1.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/nettest1/nettest1.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -402,9 +402,5 @@
 	
 	struct timeval time_before;
-	rc = gettimeofday(&time_before, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "Get time of day error %d\n", rc);
-		return rc;
-	}
+	gettimeofday(&time_before, NULL);
 	
 	nettest1_test(socket_ids,       1,        1);
@@ -414,9 +410,5 @@
 	
 	struct timeval time_after;
-	rc = gettimeofday(&time_after, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "Get time of day error %d\n", rc);
-		return rc;
-	}
+	gettimeofday(&time_after, NULL);
 	
 	printf("Tested in %ld microseconds\n", tv_sub(&time_after,
Index: uspace/app/nettest2/nettest2.c
===================================================================
--- uspace/app/nettest2/nettest2.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/nettest2/nettest2.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -356,9 +356,5 @@
 	
 	struct timeval time_before;
-	rc = gettimeofday(&time_before, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "Get time of day error %d\n", rc);
-		return rc;
-	}
+	gettimeofday(&time_before, NULL);
 	
 	rc = sockets_sendto_recvfrom(verbose, socket_ids, sockets, address,
@@ -368,9 +364,5 @@
 	
 	struct timeval time_after;
-	rc = gettimeofday(&time_after, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "Get time of day error %d\n", rc);
-		return rc;
-	}
+	gettimeofday(&time_after, NULL);
 	
 	if (verbose)
@@ -380,9 +372,5 @@
 	    tv_sub(&time_after, &time_before));
 	
-	rc = gettimeofday(&time_before, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "Get time of day error %d\n", rc);
-		return rc;
-	}
+	gettimeofday(&time_before, NULL);
 	
 	rc = sockets_sendto(verbose, socket_ids, sockets, address, addrlen,
@@ -396,9 +384,5 @@
 		return rc;
 	
-	rc = gettimeofday(&time_after, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "Get time of day error %d\n", rc);
-		return rc;
-	}
+	gettimeofday(&time_after, NULL);
 	
 	if (verbose)
Index: uspace/app/stats/stats.c
===================================================================
--- uspace/app/stats/stats.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/stats/stats.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -191,9 +191,10 @@
 static void print_uptime(void)
 {
-	sysarg_t uptime = stats_get_uptime();
-	printf("%s: Up %" PRIun " days, %" PRIun " hours, "
-	    "%" PRIun " minutes, %" PRIun " seconds\n", NAME,
-	    uptime / DAY, (uptime % DAY) / HOUR,
-	    (uptime % HOUR) / MINUTE, uptime % MINUTE);
+	struct timeval uptime;
+	getuptime(&uptime);
+	
+	printf("%s: Up %ld days, %ld hours, %ld minutes, %ld seconds\n",
+	    NAME, uptime.tv_sec / DAY, (uptime.tv_sec % DAY) / HOUR,
+	    (uptime.tv_sec % HOUR) / MINUTE, uptime.tv_sec % MINUTE);
 }
 
Index: uspace/app/tester/ipc/ping_pong.c
===================================================================
--- uspace/app/tester/ipc/ping_pong.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/tester/ipc/ping_pong.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -43,16 +43,10 @@
 	
 	struct timeval start;
-	if (gettimeofday(&start, NULL) != 0) {
-		TPRINTF("\n");
-		return "Failed getting the time";
-	}
+	gettimeofday(&start, NULL);
 	
 	uint64_t count = 0;
 	while (true) {
 		struct timeval now;
-		if (gettimeofday(&now, NULL) != 0) {
-			TPRINTF("\n");
-			return "Failed getting the time";
-		}
+		gettimeofday(&now, NULL);
 		
 		if (tv_sub(&now, &start) >= DURATION_SECS * 1000000L)
Index: uspace/app/tester/ipc/starve.c
===================================================================
--- uspace/app/tester/ipc/starve.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/tester/ipc/starve.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -40,13 +40,9 @@
 	const char *err = NULL;
 	console_ctrl_t *console = console_init(stdin, stdout);
-	if (console == NULL) {
+	if (console == NULL)
 		return "Failed to init connection with console.";
-	}
 	
 	struct timeval start;
-	if (gettimeofday(&start, NULL) != 0) {
-		err = "Failed getting the time";
-		goto leave;
-	}
+	gettimeofday(&start, NULL);
 	
 	TPRINTF("Intensive computation shall be imagined (for %ds)...\n", DURATION_SECS);
@@ -54,8 +50,5 @@
 	while (true) {
 		struct timeval now;
-		if (gettimeofday(&now, NULL) != 0) {
-			err = "Failed getting the time";
-			goto leave;
-		}
+		gettimeofday(&now, NULL);
 		
 		if (tv_sub(&now, &start) >= DURATION_SECS * 1000000L)
@@ -70,15 +63,14 @@
 		}
 	}
-
+	
 	// FIXME - unless a key was pressed, the answer leaked as no one
 	// will wait for it.
 	// We cannot use async_forget() directly, though. Something like
 	// console_forget_pending_kbd_event() shall come here.
-
+	
 	TPRINTF("Terminating...\n");
-
-leave:
+	
 	console_done(console);
-
+	
 	return err;
 }
Index: uspace/app/testread/testread.c
===================================================================
--- uspace/app/testread/testread.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/testread/testread.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -123,12 +123,5 @@
 	struct timeval prev_time;
 	struct timeval start_time;
-	int rc;
-	rc = gettimeofday(&start_time, NULL);
-	if (rc != EOK) {
-		printf("gettimeofday failed\n");
-		fclose(file);
-		free(buf);
-		return 1;
-	}
+	gettimeofday(&start_time, NULL);
 	prev_time = start_time;
 	
@@ -155,11 +148,6 @@
 		if (progress && offset >= next_mark) {
 			struct timeval cur_time;
-			rc = gettimeofday(&cur_time, NULL);
-			if (rc != EOK) {
-				printf("gettimeofday failed\n");
-				fclose(file);
-				free(buf);
-				return 1;
-			}
+			gettimeofday(&cur_time, NULL);
+			
 			uint32_t last_run = cur_time.tv_sec - prev_time.tv_sec;
 			uint32_t total_time = cur_time.tv_sec - start_time.tv_sec;
@@ -178,11 +166,5 @@
 	
 	struct timeval final_time;
-	rc = gettimeofday(&final_time, NULL);
-	if (rc != EOK) {
-		printf("gettimeofday failed\n");
-		fclose(file);
-		free(buf);
-		return 1;
-	}
+	gettimeofday(&final_time, NULL);
 	
 	uint32_t total_run_time = final_time.tv_sec - start_time.tv_sec;
Index: uspace/app/top/top.c
===================================================================
--- uspace/app/top/top.c	(revision 9696b01a9508667ab9b8592345fd6523e0ce3e76)
+++ uspace/app/top/top.c	(revision 7785ebd776871c0ff3bc03f1cdae931ac5ce1e9a)
@@ -156,6 +156,5 @@
 	/* Get current time */
 	struct timeval time;
-	if (gettimeofday(&time, NULL) != EOK)
-		return "Cannot get time of day";
+	gettimeofday(&time, NULL);
 	
 	target->hours = (time.tv_sec % DAY) / HOUR;
@@ -164,9 +163,11 @@
 	
 	/* Get uptime */
-	sysarg_t uptime = stats_get_uptime();
-	target->udays = uptime / DAY;
-	target->uhours = (uptime % DAY) / HOUR;
-	target->uminutes = (uptime % HOUR) / MINUTE;
-	target->useconds = uptime % MINUTE;
+	struct timeval uptime;
+	getuptime(&uptime);
+	
+	target->udays = uptime.tv_sec / DAY;
+	target->uhours = (uptime.tv_sec % DAY) / HOUR;
+	target->uminutes = (uptime.tv_sec % HOUR) / MINUTE;
+	target->useconds = uptime.tv_sec % MINUTE;
 	
 	/* Get load */