Merge "Revert "[Setting] Cleanup Unused SimSettings""