diff --git a/application/application.go b/application/application.go
index 04918b1..dea08cc 100644
--- a/application/application.go
+++ b/application/application.go
@@ -59,13 +59,7 @@ func (ra *RicochetApplication) handleConnection(conn net.Conn) {
 	ra.lock.Lock()
 	for i, x := range ra.instances {
 		if x == rai {
-			if i == 0 {
-				ra.instances = ra.instances[1:]
-			} else if i == len(ra.instances)-1 {
-				ra.instances = ra.instances[:i-1]
-			} else {
-				ra.instances = append(ra.instances[:i-1], ra.instances[i+1:]...)
-			}
+			ra.instances = append(ra.instances[:i], ra.instances[i+1:]...)
 			break
 		}
 	}