Remove now dead code
Break out the metrics store into its own module