Removed submodule and upated setup.sh