Remove unnecessary lines from Metrics and unused files