tweaks and removing some old stuff.