Got rid of more useless stuff.

Simplifying things.