removed unneccesarry code