removed smart collections
removed smart-collections from some other places