CON-2076 | Zenbox removed old code