removing unneccesary piece of code