make consistent with deploy and setup wrt -b