cleanup; remove unnecessary swappable filer swap/sync in hybrid activity index; minor refactor to assist with profiling