Cleanup Options

Removing option to replace components on loading