updates to remove metrics