Remove reduntdants and update setup.sh