Remove bbc comsos reference and use env variables