diff --git a/PackedMessage.cpp b/PackedMessage.cpp
index 32c505670..f235fea15 100644
--- a/PackedMessage.cpp
+++ b/PackedMessage.cpp
@@ -27,18 +27,17 @@ bool PackedMessage::operator == (const PackedMessage& other)
 	return(mBuffer==other.mBuffer);
 }
 
-// TODO: this is nonsense
 unsigned PackedMessage::getLength(std::vector<uint8_t>& buf)
 {
 	if(buf.size() < HEADER_SIZE) return 0;
 
 	int ret=buf[0];
-	ret= ret << 8;
-	ret= ret | buf[1];
-	ret= ret << 8;
-	ret= ret | buf[2];
-	ret= ret << 8;
-	ret= ret | buf[3];
+	ret<<=8;
+	ret|=buf[1];
+	ret<<=8;
+	ret|=buf[2];
+	ret<<=8;
+	ret|=buf[3];
 
 	return(ret);
 }
@@ -48,8 +47,8 @@ int PackedMessage::getType(std::vector<uint8_t>& buf)
 	if(buf.size() < HEADER_SIZE) return 0;
 
 	int ret=buf[4];
-	ret= ret << 8;
-	ret= ret | buf[5];
+	ret<<=8;
+	ret|=buf[5];
 	return(ret);
 }
 
diff --git a/Peer.cpp b/Peer.cpp
index daad40ae7..beca656ec 100644
--- a/Peer.cpp
+++ b/Peer.cpp
@@ -15,7 +15,6 @@ using namespace boost::asio::ip;
 Peer::Peer(boost::asio::io_service& io_service)
 	: mSocket(io_service)
 {
-	mSendingPacket=PackedMessage::pointer();
 }
 
 /*