remove the redundant code that added to support mapwritable/sqlparser
fix CollapsingAggregate bug