Cleanup: remove inactive switches. Reduce differences to main branch.