Updating setup to not have any removal