Clean up, work in progress.