Move metrics out of app