General cleanup, shade Updater and Metrics.