Changes to remove the unwanted collections