Cleanup, little progress.