Cleanup, updated.