remove old datastructures.
tweaks.