further cleanup of scripts for sustainability