Small fix and remove old scripts