Removing old scripts and fixing a bug in setup script