Remove some unused files
Readapt some older scripts. Minor refactoring