diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c
index bfa655df..25d5f9bd 100644
--- a/src/gadc/gadc.c
+++ b/src/gadc/gadc.c
@@ -249,7 +249,15 @@ void _gadcInit(void)
 
 void _gadcDeinit(void)
 {
-	/* ToDo */
+	/* commented stuff is ToDo */
+
+	// gadc_lld_deinit();
+	gfxSemDestroy(&gadcsem);
+	gfxMutexDestroy(&gadcmutex);
+	//gtimerDeinit(&LowSpeedGTimer);
+	#if GFX_USE_GEVENT
+		//gtimerDeinit(&HighSpeedGTimer);
+	#endif	
 }
 
 static inline void StartADC(bool_t onNoHS) {
diff --git a/src/gaudin/gaudin.c b/src/gaudin/gaudin.c
index 2f0883e7..8a425a10 100644
--- a/src/gaudin/gaudin.c
+++ b/src/gaudin/gaudin.c
@@ -94,7 +94,10 @@ void _gaudinInit(void)
 
 void _gaudinDeinit(void)
 {
-	/* ToDo */
+	// Commented stuff still ToDo
+	#if GFX_USE_GEVENT
+		gtimerDeinit(&AudGTimer);
+	#endif
 }
 
 bool_t gaudinInit(uint16_t channel, uint32_t frequency, audin_sample_t *buffer, size_t bufcount, size_t samplesPerEvent) {
diff --git a/src/gevent/gevent.c b/src/gevent/gevent.c
index 67b32747..779f63a0 100644
--- a/src/gevent/gevent.c
+++ b/src/gevent/gevent.c
@@ -53,7 +53,7 @@ void _geventInit(void)
 
 void _geventDeinit(void)
 {
-	/* ToDo */
+	gfxMutexDestroy(&geventMutex);	
 }
 
 void geventListenerInit(GListener *pl) {
diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c
index b8f3d4fa..311176fa 100644
--- a/src/gtimer/gtimer.c
+++ b/src/gtimer/gtimer.c
@@ -126,7 +126,8 @@ void _gtimerInit(void)
 
 void _gtimerDeinit(void)
 {
-	/* ToDo */
+	gfxSemDestroy(&waitsem);
+	gfxMutexDestroy(&mutex);
 }
 
 void gtimerInit(GTimer *pt) {