CON-1784 | zipped duplicated code, removed the unused