removed old conditional version logic