Updated metrics to R7. Removed all the useless stuff!