Aggregate table creation and other cleanup