erased un-necessary code