Removing unused stuff to find the error