Tokyo nixes 'kumitaiso' at schools