Fixes #888, remove script for all undef cases