Cleanup, still something weird.