started removing the classes.

trying to sneak extra performance.