Some cleanup of scripts