'group-by-quarter' cleanup