removed clutter and finished the stuff.