Clean up.

Some clean up.