Removed gorilla dependency