New script & cleanup