diff --git a/src/Map.cpp b/src/Map.cpp
index 2d8f57168..79370b097 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -243,7 +243,7 @@ bool cMap::UpdatePixel(unsigned int a_X, unsigned int a_Z)
 			{
 				for (unsigned int Z = m_RelZ; Z < m_RelZ + PixelWidth; ++Z)
 				{
-					unsigned int WaterDepth = 0;
+					// unsigned int WaterDepth = 0;
 
 					BLOCKTYPE TargetBlock = E_BLOCK_AIR;
 					NIBBLETYPE TargetMeta = 0;
@@ -261,12 +261,14 @@ bool cMap::UpdatePixel(unsigned int a_X, unsigned int a_Z)
 							continue;
 						}
 						// TODO 2014-02-22 xdot: Check if block is liquid
+						/*
 						else if (false)
 						{
 							--Height;
 							++WaterDepth;
 							continue;
 						}
+						*/
 
 						break;
 					}
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index 3f9275798..ad622d707 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -454,7 +454,6 @@ AString & UTF8ToRawBEUTF16(const char * a_UTF8, size_t a_UTF8Length, AString & a
 		if (!isLegalUTF8(source, extraBytesToRead + 1))
 		{
 			return a_UTF16;
-			break;
 		}
 		
 		// The cases all fall through. See "Note A" below.
diff --git a/src/main.cpp b/src/main.cpp
index 2ae8a413b..68eea7f4d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,7 +72,6 @@ void NonCtrlHandler(int a_Signal)
 			LOGERROR("  D:    | MCServer has encountered an error and needs to close");
 			LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault");
 			exit(EXIT_FAILURE);
-			break;
 		}
 		case SIGINT:
 		case SIGTERM: