Cleanup unused MSCs
No more TODOs in chapters 1-4