Remove scriptName commands, better debug marker removal