Minor cleanup
Add MasterC component as catchall component during redesign
Clean up modifiers