Metis clean up

Reviewers: marcua

Reviewed By: marcua

Differential Revision: http://phabricator.locu.com/D3717