Cleanup and script change.