removed metrics - will implement another way to record them