Comment unused code and add ||>