script cleanup

VB-Patchset #3