Disabled focused bw infer temporarily, since it needs updated to account for valve selector substitutions.
Reorganized some code to do with rempoving valve selectors to be more natural.