make currections to metrics code
removed obsolote files
removed obsolete files