[IMP] removed unrequired code