started to cleanup envs
merge bnm
all env working except ipa-factory