[Optimization] Useless building collection removed