cleanup
performance optimization for 'aggregated' views
cleanup