Added possibility to remove Aggregate functions.