Fix: removing not neccessary lines