Specific Discipline content types are gone! Cleanup continues...
Misc cleanup.