Fixing up design a bit.
Removing old stuff, fixing up design.