diff --git a/context.go b/context.go
index e9c2fd6..eec329c 100644
--- a/context.go
+++ b/context.go
@@ -105,17 +105,14 @@ func (c *Context) Get(key string) interface{} {
 
 // RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned
 func (c *Context) RealIP() string {
-	reqIP := c.Request.RemoteAddr
-
 	if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` {
-		reqIP = strings.Split(ip, `, `)[0]
-	} else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
-		reqIP = ip
+		return strings.Split(ip, `, `)[0]
 	}
 
-	ra, _, _ := net.SplitHostPort(reqIP)
-	if ra != `` {
-		reqIP = ra
+	if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
+		return ip
 	}
-	return reqIP
+
+	ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
+	return ra
 }
diff --git a/router.go b/router.go
index d869fc6..f53b4ca 100644
--- a/router.go
+++ b/router.go
@@ -38,7 +38,6 @@ type Router struct {
 	NotFoundHandler         Handle
 	MethodNotAllowedHandler Handle
 	ErrorHandler            ErrorHandle
-	TrimTrailingSlashes     bool
 	server                  *http.Server
 }
 
@@ -128,7 +127,7 @@ func (r *Router) Stop() error {
 	return err
 }
 
-func (r *Router) getHttpr() http.Handler {
+func (r *Router) getHttpr() *httprouter.Router {
 	httpr := httprouter.New()
 
 	for _, v := range r.routes {
@@ -157,18 +156,6 @@ func (r *Router) getHttpr() http.Handler {
 		r.ErrorHandler(c, err)
 	}
 
-	if r.TrimTrailingSlashes {
-		httpr.RedirectTrailingSlash = false
-
-		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			l := len(req.URL.Path)
-			if l > 1 && req.URL.Path[l-1] == '/' {
-				req.URL.Path = req.URL.Path[:l-1]
-			}
-			httpr.ServeHTTP(w, req)
-		})
-	}
-
 	return httpr
 }