More metal cleanup