Continue clean up scripts to be totally VO generic