Not ready for that return just yet
Remove checkers for metrics that no longer appear
Need to track metric keys per updater