Some Cleanup.