Tidying / refactoring before removal of sub-series.

Why do we disable these instead of removing them?