Comment unused stuff