1) deleted old-scripts
2) more refactoring