diff --git a/policy/http-header.bro b/policy/http-header.bro
index 259031b024..3d676488ff 100644
--- a/policy/http-header.bro
+++ b/policy/http-header.bro
@@ -2,8 +2,6 @@
 
 # Prints out detailed HTTP headers.
 
-@load http
-
 module HTTP;
 
 export {
diff --git a/src/HTTP.cc b/src/HTTP.cc
index 85872f7c79..0cccf75103 100644
--- a/src/HTTP.cc
+++ b/src/HTTP.cc
@@ -16,21 +16,16 @@
 
 const bool DEBUG_http = false;
 
-/* The EXPECT_*_NOTHING states are used to prevent further parsing. Used
- * if a message was interrupted. 
- */
 enum {
 	EXPECT_REQUEST_LINE,
 	EXPECT_REQUEST_MESSAGE,
 	EXPECT_REQUEST_TRAILER,
-	EXPECT_REQUEST_NOTHING,
 };
 
 enum {
 	EXPECT_REPLY_LINE,
 	EXPECT_REPLY_MESSAGE,
 	EXPECT_REPLY_TRAILER,
-	EXPECT_REPLY_NOTHING,
 };
 
 HTTP_Entity::HTTP_Entity(HTTP_Message *arg_message, MIME_Entity* parent_entity, int arg_expect_body)
@@ -856,20 +851,7 @@ void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)
 					HTTP_Event("crud_trailing_HTTP_request",
 						   new_string_val(line, end_of_line));
 				else
-					{
-					// We do see HTTP requests with a trailing EOL that's not 
-					// not accounted for by the content-length. This will lead
-					// to a call to this method with len==0 while we are 
-					// expecting a new request. Since HTTP servers handle
-					// such request gracefully, we should do so as well. 
-					if (len==0)
-						Weird("empty_http_request");
-					else 
-						{
-						ProtocolViolation("not a http request line");
-						request_state = EXPECT_REQUEST_NOTHING;
-						}
-					}
+					ProtocolViolation("not a http request line");
 				}
 			break;
 
@@ -879,9 +861,6 @@ void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)
 
 		case EXPECT_REQUEST_TRAILER:
 			break;
-
-		case EXPECT_REQUEST_NOTHING:
-			break;
 		}
 		}
 	else
@@ -894,8 +873,6 @@ void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)
 
 				if ( unanswered_requests.empty() )
 					Weird("unmatched_HTTP_reply");
-				else
-					ProtocolConfirmation();
 
 				reply_state = EXPECT_REPLY_MESSAGE;
 				reply_ongoing = 1;
@@ -908,10 +885,7 @@ void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)
 						len);
 				}
 		    else
-				{
 				ProtocolViolation("not a http reply line");
-				reply_state = EXPECT_REPLY_NOTHING;
-				}
 
 			break;
 
@@ -921,9 +895,6 @@ void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)
 
 		case EXPECT_REPLY_TRAILER:
 			break;
-
-		case EXPECT_REPLY_NOTHING:
-			break;
 		}
 		}
 	}
@@ -1071,8 +1042,6 @@ int HTTP_Analyzer::HTTP_RequestLine(const char* line, const char* end_of_line)
 		// HTTP methods for distributed authoring.
 		"PROPFIND", "PROPPATCH", "MKCOL", "DELETE", "PUT",
 		"COPY", "MOVE", "LOCK", "UNLOCK",
-		// More stuff
-		"POLL", "REPORT", "SUBSCRIBE", "BMOVE",
 
 		"SEARCH",
 
@@ -1086,7 +1055,7 @@ int HTTP_Analyzer::HTTP_RequestLine(const char* line, const char* end_of_line)
 
 	if ( ! http_methods[i] )
 		{
-		//Weird("HTTP_unknown_method");
+		// Weird("HTTP_unknown_method");
 		if ( RequestExpected() )
 			HTTP_Event("unknown_HTTP_method", new_string_val(line, end_of_line));
 		return 0;
@@ -1287,10 +1256,7 @@ void HTTP_Analyzer::RequestMade(const int interrupted, const char* msg)
 
 	num_request_lines = 0;
 
-	if (interrupted)
-		request_state = EXPECT_REQUEST_NOTHING;
-	else 
-		request_state = EXPECT_REQUEST_LINE;
+	request_state = EXPECT_REQUEST_LINE;
 	}
 
 void HTTP_Analyzer::ReplyMade(const int interrupted, const char* msg)
@@ -1319,10 +1285,7 @@ void HTTP_Analyzer::ReplyMade(const int interrupted, const char* msg)
 		reply_reason_phrase = 0;
 		}
 
-	if (interrupted)
-		reply_state = EXPECT_REPLY_NOTHING;
-	else
-		reply_state = EXPECT_REPLY_LINE;
+	reply_state = EXPECT_REPLY_LINE;
 	}
 
 void HTTP_Analyzer::RequestClash(Val* /* clash_val */)
diff --git a/src/bro.bif b/src/bro.bif
index af841600c8..0de77bfc49 100644
--- a/src/bro.bif
+++ b/src/bro.bif
@@ -1365,17 +1365,12 @@ function skip_http_entity_data%(c: connection, is_orig: bool%): any
 		{
 		Analyzer* ha = c->FindAnalyzer(id);
 
-		if (ha)
-			{
-			if ( ha->GetTag() == AnalyzerTag::HTTP )
-				static_cast<HTTP_Analyzer*>(ha)->SkipEntityData(is_orig);
-			else
-				run_time("non-HTTP analyzer associated with connection record");
-			}
+		if ( ha->GetTag() == AnalyzerTag::HTTP )
+			static_cast<HTTP_Analyzer*>(ha)->SkipEntityData(is_orig);
 		else
-			run_time("could not find analyzer for skip_http_entity_data");
-
+			run_time("non-HTTP analyzer associated with connection record");
 		}
+
 	else
 		run_time("no analyzer associated with connection record");