diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
index 348477a..1801471 100644
--- a/include/fc/reflect/reflect.hpp
+++ b/include/fc/reflect/reflect.hpp
@@ -375,11 +375,3 @@ namespace fc { \
   template<> struct get_typename<TYPE>  { static const char* name()  { return BOOST_PP_STRINGIZE(TYPE);  } }; \
 }
 
-// vvv These are preserved to merge more smoothly vvv
-#define FC_REFLECT_BASE_MEMBER_COUNT( r, OP, elem ) \
-  OP fc::reflector<elem>::total_member_count
-
-#define FC_REFLECT_MEMBER_COUNT( r, OP, elem ) \
-  OP 1
-// ^^^ These can be removed after updating graphene/protocol/types.hpp ^^^
-
diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp
index d284963..757ebb3 100644
--- a/include/fc/static_variant.hpp
+++ b/include/fc/static_variant.hpp
@@ -118,7 +118,7 @@ public:
     template<typename X, typename = type_in_typelist<X>>
     struct tag
     {
-       static const int value = typelist::index_of<list, X>();
+       static constexpr int value = typelist::index_of<list, X>();
     };
 
     struct type_lt {
@@ -293,7 +293,7 @@ public:
         });
     }
 
-    static int count() { return typelist::length<list>(); }
+    static constexpr int count() { return typelist::length<list>(); }
     void set_which( tag_type w ) {
       FC_ASSERT( w >= 0 );
       FC_ASSERT( w < count() );
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 45332f5..5138fb0 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -300,10 +300,6 @@ namespace fc { namespace http {
                   _server.close( item.first, 0, "server exit" );
 
                if( _closed ) _closed->wait();
-#ifdef TRAVIS_BUILD
-#warning Adding 100ms sleep to ~websocket_server_impl() to stabilize Travis tests
-               fc::usleep(fc::milliseconds(100));
-#endif
             }
 
             typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map;