removing and cleaning up pattern use.

Gotta tighten up the design and stuff.