Cleanup
Removed no longer valid TODO. cleanup.
Re-Add AddSilence (not tested)