diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index 55b1235ae..a23285146 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -4083,8 +4083,6 @@ string SrsConfig::get_work_dir() {
     }
     
     return conf->arg0();
-    
-    return conf->arg0();
 }
 
 bool SrsConfig::get_asprocess()
diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp
index f22e8e622..1466c96f8 100644
--- a/trunk/src/protocol/srs_rtmp_stack.hpp
+++ b/trunk/src/protocol/srs_rtmp_stack.hpp
@@ -41,21 +41,15 @@
 #include <srs_core_performance.hpp>
 #include <srs_kernel_flv.hpp>
 
-class ISrsProtocolReadWriter;
 class SrsFastStream;
-class SrsPacket;
 class SrsBuffer;
-class SrsAmf0Object;
 class SrsAmf0Any;
 class SrsMessageHeader;
-class SrsCommonMessage;
 class SrsChunkStream;
 class SrsSharedPtrMessage;
-class IMergeReadHandler;
 
 class SrsProtocol;
 class ISrsProtocolReadWriter;
-class SrsCommonMessage;
 class SrsCreateStreamPacket;
 class SrsFMLEStartPacket;
 class SrsPublishPacket;