Removed more collections. 10 times faster