Major Metis clean-up

Test Plan: -

Reviewers: lydia, marcua

Reviewed By: marcua

Differential Revision: https://phabricator.locu.com/D7685