cleanup, removed presets, metric to components