Update to add metrics cleaning, updated file extension to work