Renamed setup.sh to setup and added cleanup