Separate script generation
Remove outdated stuff