get rid of old stuff.
tidy code.