CON-Venus remove duplicated code