Metrics: removed unnecessary DefaultMetricsSystem#shutdown() call, + some insignificant cleanup.