clean up and new script