diff --git a/src/AggregateFunctions/AggregateFunctionState.h b/src/AggregateFunctions/AggregateFunctionState.h
index 8de17580758..24d1a694e0a 100644
--- a/src/AggregateFunctions/AggregateFunctionState.h
+++ b/src/AggregateFunctions/AggregateFunctionState.h
@@ -114,7 +114,7 @@ public:
 
     IColumn * extractStateColumnFromResultColumn(IColumn * column) const override
     {
-        return assert_cast<ColumnAggregateFunction *>(column);
+        return column;
     }
 
     bool allocatesMemoryInArena() const override
diff --git a/src/Interpreters/AggregationUtils.cpp b/src/Interpreters/AggregationUtils.cpp
index 146d950d2c5..4d2f7647628 100644
--- a/src/Interpreters/AggregationUtils.cpp
+++ b/src/Interpreters/AggregationUtils.cpp
@@ -1,5 +1,4 @@
 #include <Interpreters/AggregationUtils.h>
-#include <Columns/ColumnMap.h>
 
 namespace DB
 {