Cleaned up code.
Enabled Metrics reporting again. Still using deprecated method.