cleanup scripts a bit, since there will be another refactor now