clean up for recent changes to scripts