Removed extra metrics stuff