removed uneded code