code elimination almost done.