cleanup: remove "Aggregator" and "Buffer" cast