Scipt cleanup