[IMP] removed unneccessary code