remove broken superceeded things, fix poly_mult