Some clean up.
Some stuff.