Removed some hard-coded data, changed file names, deleted one-shot scripts