[IMP] removed unnecessary code