Remove metrics, update for 1.6.4